Skip to content

Conversation

@bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Oct 26, 2025

This upstreams all redox patches that can be upstreamed.

cc @jackpot51

@bjorn3 bjorn3 added the O-redox Operating system: Redox, https://www.redox-os.org/ label Oct 26, 2025
@rustbot
Copy link
Collaborator

rustbot commented Oct 26, 2025

These commits modify compiler targets.
(See the Target Tier Policy.)

Some changes occurred in src/doc/rustc/src/platform-support

cc @Noratrieb

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 26, 2025
@rustbot
Copy link
Collaborator

rustbot commented Oct 26, 2025

r? @lcnr

rustbot has assigned @lcnr.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Oct 29, 2025

☔ The latest upstream changes (presumably #148241) made this pull request unmergeable. Please resolve the merge conflicts.

jackpot51 and others added 2 commits October 29, 2025 13:14
@rustbot
Copy link
Collaborator

rustbot commented Oct 29, 2025

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@mati865
Copy link
Member

mati865 commented Oct 29, 2025

@bors r? @mati865

@bors r+ rollup

@rustbot rustbot assigned mati865 and unassigned lcnr Oct 29, 2025
@mati865
Copy link
Member

mati865 commented Oct 29, 2025

bors?

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 29, 2025

📌 Commit fa0f163 has been approved by mati865

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 29, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 29, 2025
Couple of changes for Redox OS

This upstreams all redox patches that can be upstreamed.

cc `@jackpot51`
bors added a commit that referenced this pull request Oct 30, 2025
Rollup of 4 pull requests

Successful merges:

 - #148115 (rustdoc: Rename unstable option `--nocapture` to `--no-capture` in accordance with `libtest`)
 - #148137 (Couple of changes for Redox OS)
 - #148176 ([rustdoc] Include attribute and derive macros when filtering on "macros")
 - #148253 (Handle default features and -Ctarget-features in the dummy backend)

r? `@ghost`
`@rustbot` modify labels: rollup
Zalathar added a commit to Zalathar/rust that referenced this pull request Oct 30, 2025
Couple of changes for Redox OS

This upstreams all redox patches that can be upstreamed.

cc ``@jackpot51``
bors added a commit that referenced this pull request Oct 30, 2025
Rollup of 9 pull requests

Successful merges:

 - #138217 (Turn `Cow::is_borrowed,is_owned` into associated functions.)
 - #147858 (Micro-optimization attempt in coroutine layout computation)
 - #147923 (Simplify rustc_public context handling)
 - #147935 (Add LLVM realtime sanitizer)
 - #148115 (rustdoc: Rename unstable option `--nocapture` to `--no-capture` in accordance with `libtest`)
 - #148137 (Couple of changes for Redox OS)
 - #148176 ([rustdoc] Include attribute and derive macros when filtering on "macros")
 - #148193 (Remove `QPath::LangItem`)
 - #148253 (Handle default features and -Ctarget-features in the dummy backend)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Oct 30, 2025
Rollup of 8 pull requests

Successful merges:

 - #138217 (Turn `Cow::is_borrowed,is_owned` into associated functions.)
 - #147858 (Micro-optimization attempt in coroutine layout computation)
 - #147923 (Simplify rustc_public context handling)
 - #148115 (rustdoc: Rename unstable option `--nocapture` to `--no-capture` in accordance with `libtest`)
 - #148137 (Couple of changes for Redox OS)
 - #148176 ([rustdoc] Include attribute and derive macros when filtering on "macros")
 - #148253 (Handle default features and -Ctarget-features in the dummy backend)
 - #148272 (Align VEX V5 boot routine to 4 bytes)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a749188 into rust-lang:master Oct 30, 2025
11 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Oct 30, 2025
rust-timer added a commit that referenced this pull request Oct 30, 2025
Rollup merge of #148137 - bjorn3:redox_fixes, r=mati865

Couple of changes for Redox OS

This upstreams all redox patches that can be upstreamed.

cc ```@jackpot51```
@bjorn3 bjorn3 deleted the redox_fixes branch October 30, 2025 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

O-redox Operating system: Redox, https://www.redox-os.org/ S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants